Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 18:49:29 +0000 (11:49 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 18:49:29 +0000 (11:49 -0700)
commit24b4d08b95d14dd433ce49c44257d0a3f0be0aa5
tree6cf8de35e3ad0916648f02d1c999f481a226249d
parent71adb7d254c0372903ca36014f7893ce3a94df76
parent79b9a37aca5d4cdcb09645715a734e62db4f2385
Merge from trunk.